6ba5173e7958fa1a277db5435cd4e9588179c314,clc/modules/simplequeue/src/main/java/com/eucalyptus/simplequeue/SimpleQueueService.java,SimpleQueueService,receiveMessage,#ReceiveMessageType#,722

Before Change


          filterReceiveAttributes(message, request.getAttributeName());
          filterReceiveMessageAttributes(message, request.getMessageAttributeName());
        }
        reply.getReceiveMessageResult().getMessage().addAll(messages);
      }
    } catch (Exception ex) {
      handleException(ex);

After Change


        // malformed or nonexistent redrive policy, just leave the message where it is?
      }
      if (messagesWithReceiveCounts != null) {
        for (MessagePersistence.MessageWithReceiveCounts messageWithReceiveCounts: messagesWithReceiveCounts) {
          Message message = messageWithReceiveCounts.getMessage();
          if (hasActiveLegalRedrivePolicy && messageWithReceiveCounts.getLocalReceiveCount() > maxReceiveCount) {
            PersistenceFactory.getMessagePersistence().moveMessageToDeadLetterQueue(queue, message, deadLetterQueue);
          } else {
            filterReceiveAttributes(message, request.getAttributeName());
            filterReceiveMessageAttributes(message, request.getMessageAttributeName());
            reply.getReceiveMessageResult().getMessage().add(message);
          }
        }
      }